bitkeeper revision 1.1108.1.39 (4107e1f4lY3QEYh9L9XnSVpW1HjOSQ)

manually merge kmalloc->xmalloc

diff --git a/xen/arch/x86/pdb-stub.c b/xen/arch/x86/pdb-stub.c
index c4ebf74a3d34664f7cf734f5b659bac5252b8c7f..ea7f137c9a97f2c401ba35f71e1ef774e3f1eb5d 100644 (file)
--- a/xen/arch/x86/pdb-stub.c
+++ b/xen/arch/x86/pdb-stub.c
@@ -312,7 +312,7 @@ pdb_process_z (int onoff, char *ptr)
        {
            if (onoff == 1)
            {
-               pdb_bwcpoint_p bwc = (pdb_bwcpoint_p) kmalloc(sizeof(pdb_bwcpoint_t));
+               pdb_bwcpoint_p bwc = (pdb_bwcpoint_p) xmalloc(sizeof(pdb_bwcpoint_t));
 
                bwc->address = addr;
                bwc->length = pdb_x86_bkpt_length;
@@ -350,7 +350,7 @@ pdb_process_z (int onoff, char *ptr)
        {
            if (onoff == 1)
            {
-               pdb_bwcpoint_p bwc = (pdb_bwcpoint_p) kmalloc(sizeof(pdb_bwcpoint_t));
+               pdb_bwcpoint_p bwc = (pdb_bwcpoint_p) xmalloc(sizeof(pdb_bwcpoint_t));
 
                bwc->address = addr;
                bwc->length = length;
@@ -734,15 +734,15 @@ pdb_process_command (char *ptr, struct pt_regs *regs, unsigned long cr3,
                    pdb_page_fault = 0;
 
            {
-               u_char *buffer = (u_char *) kmalloc (length);
+               u_char *buffer = (u_char *) xmalloc (length);
                if (!buffer)
                {
-                   printk ("pdb error: kmalloc failure\n");
+                   printk ("pdb error: xmalloc failure\n");
                    break;
                }
                pdb_read_memory (addr, length, buffer, &pdb_ctx);
                mem2hex (buffer, pdb_out_buffer, length); 
-               kfree(buffer);
+               xfree(buffer);
            }
 
                    pdb_page_fault_possible = 0;
@@ -772,15 +772,15 @@ pdb_process_command (char *ptr, struct pt_regs *regs, unsigned long cr3,
            pdb_page_fault = 0;
 
            {
-               u_char *buffer = (u_char *) kmalloc (length);
+               u_char *buffer = (u_char *) xmalloc (length);
                if (!buffer)
                {
-                   printk ("pdb error: kmalloc failure\n");
+                   printk ("pdb error: xmalloc failure\n");
                    break;
                }
                hex2mem (ptr, buffer, length);
                pdb_write_memory (addr, length, buffer, &pdb_ctx);
-               kfree(buffer);
+               xfree(buffer);
            }
 
            pdb_page_fault_possible = 0;